steemtown

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "editor.tabSize": 2,
+    "editor.detectIndentation": false
+}

README.md

@@ -3,6 +3,7 @@
 
 
 Condenser is the react.js web interface to the world's first and best
+<<<<<<< HEAD
 blockchain-based social media platform, steemit.com.  It uses
 [STEEM](https://github.com/steemit/steem), a blockchain powered by DPoS Governance and ChainBase DB to store JSON-based content for a plethora of web
 applications.
@@ -13,13 +14,29 @@ applications.
   content storage mechanism in react.js
 * Reviewing the inner workings of the steemit.com social media platform
 * Assisting with software development for steemit.com
+=======
+blockchain-based social media platform, steem.town.  It uses
+[STEEM](https://github.com/SteemDevs/steem), a blockchain powered by DPoS Governance and ChainBase DB to store JSON-based content for a plethora of web
+applications.
+
+## Why would I want to use Condenser (steem.town front-end)?
+
+* Learning how to build blockchain-based web applications using STEEM as a
+  content storage mechanism in react.js
+* Reviewing the inner workings of the steem.town social media platform
+* Assisting with software development for steem.town
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 ## Installation
 
 #### Docker
 
 We highly recommend using docker to run condenser in production. This is how we run the
+<<<<<<< HEAD
 live steemit.com site and it is the most supported (and fastest) method of
+=======
+live steem.town site and it is the most supported (and fastest) method of
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 both building and running condenser. We will always have the latest version
 of condenser (master branch) available on Docker Hub. Configuration settings
 can be set using environment variables (see configuration section below for
@@ -109,7 +126,11 @@ yarn run start
 It will take quite a bit longer to start in this mode (~60s) as it needs to
 build and start the webpack-dev-server.
 
+<<<<<<< HEAD
 By default you will be connected to steemit.com's public steem node at
+=======
+By default you will be connected to steem.town's public steem node at
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 `wss://steemd.steeemit.com`. This is actually on the real blockchain and
 you would use your regular account name and credentials to login - there is
 not an official separate testnet at this time. If you intend to run a

config/default.json

@@ -19,7 +19,11 @@
     "reportOnly": false,
     "setAllHeaders": true
   },
+<<<<<<< HEAD
   "img_proxy_prefix": "https://steemitdevimages.com/",
+=======
+  "img_proxy_prefix": "https://steemitimages.com/",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   "ipfs_prefix": false,
   "mixpanel": false,
   "notify": {
@@ -33,7 +37,11 @@
   "server_session_secret": "exiKdyF+IwRIXJDmtGIl4vWUz4i3eVSISpfZoeYc0s4=",
   "session_cookie_key": "stm-dev",
   "session_key": "steemses",
+<<<<<<< HEAD
   "site_domain": "steemitdev.com",
+=======
+  "site_domain": "steem.town",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   "upload_image": false,
   "steemd_connection_client": "https://api.steemit.com",
   "steemd_connection_server": "https://api.steemit.com",
@@ -43,7 +51,11 @@
   "conveyor_posting_wif": false,
   "conveyor_username": false,
   "special_posts_url": false,
+<<<<<<< HEAD
   "wallet_url": "https://wallet.steemitdev.com",
+=======
+  "wallet_url": "https://wallet.steem.town",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   "gpt_banned_tags": ["nsfw", "tante"],
   "google_ad_enabled": null,
   "google_ad_test": null,

package.json

@@ -1,11 +1,21 @@
 {
+<<<<<<< HEAD
   "name": "steemit.com",
   "repository": {
     "type": "git",
     "url": "https://github.com/steemit/steemit.com.git"
   },
   "version": "1.0.0",
   "description": "steemit.com is the koa web server & middleware and react.js in-browser code for the world's first blockchain content + social media monetization platform!",
+=======
+  "name": "steem.town",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/therealwolf42/condenser.git"
+  },
+  "version": "1.0.0",
+  "description": "steem.town is the koa web server & middleware and react.js in-browser code for the world's first blockchain content + social media monetization platform!",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   "main": "index.js",
   "scripts": {
     "build": "NODE_ENV=production webpack --config ./webpack/prod.config.js && rm -rf ./lib && babel src --out-dir lib -Dq",
@@ -86,7 +96,11 @@
     "mixpanel": "0.5.0",
     "net": "1.0.2",
     "node-cache": "^4.2.0",
+<<<<<<< HEAD
     "node-sass": "4.9.0",
+=======
+    "node-sass": "^4.13.1",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     "os": "0.1.1",
     "picturefill": "3.0.2",
     "qrious": "^4.0.2",

src/app/assets/static/manifest.json

@@ -1,6 +1,11 @@
 {
+<<<<<<< HEAD
     "name": "Steemit",
     "short_name": "Steemit",
+=======
+    "name": "SteemTown",
+    "short_name": "SteemTown",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     "theme_color": "#FFFFFF",
     "background_color": "#FFFFFF",
     "start_url": "/",

src/app/assets/static/search.html

@@ -3,7 +3,11 @@
     <meta charSet="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" type="image/ico" href="/favicon.ico" />
+<<<<<<< HEAD
     <title>Search - steemit.com</title>
+=======
+    <title>Search - steem.town</title>
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/foundation/6.2.1/foundation-flex.css">
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro" rel="stylesheet">
     <style>

src/app/assets/stylesheets/_variables.scss

@@ -8,28 +8,53 @@ $color-blue-original-dark: #1A5099;
 $color-blue-original-light: #4BA2F2;
 $color-blue-black: #171F24;
 $color-blue-black-darkest: #11161A;
+<<<<<<< HEAD
 $color-blue-dark: #2C3A45;
 $color-teal: #06D6A9;
 $color-teal-light:#00FFC8;
 $color-teal-dark:#049173;
+=======
+$color-blue-dark: rgb(17, 23, 27);
+$color-teal: #03a2ff;
+$color-teal-light:#0ea7ff;
+$color-teal-dark:#0599ee;
+
+/*
+$color-teal: rgb(6, 89, 214);
+$color-teal-light:rgb(11, 98, 228);
+$color-teal-dark:rgb(5, 83, 201);
+*/
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 $color-yellow: #fce76c;
 $color-orange: #F76900;
 $color-transparent: transparent;
 
 $color-background-almost-white:#fefefe;
+<<<<<<< HEAD
 $color-background-off-white: #f4f4f4;
 $color-background-off-white-light: #fafafa;
 $color-background-dark: #1C252B;
 $color-background-less-dark: #283336;
 $color-background-super-dark: #10151b;
+=======
+$color-background-off-white: #f1f5fa;
+$color-background-off-white-light: #fafafa;
+$color-background-dark: #252b36;
+$color-background-less-dark: #2d323b;
+$color-background-super-dark: rgb(18, 25, 32);
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 $color-text-dark: #333;
 $color-text-white: #fcfcfc;
 $color-text-blue: #004EFF;
 $color-text-gray: #788187;
 $color-text-gray-light: #A6B2BA;
+<<<<<<< HEAD
 $color-text-teal: #1FBF8F;
+=======
+$color-text-teal: $color-teal;
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 $color-text-red: $color-red;
 
 $color-border-light: #eee;

src/app/assets/stylesheets/app.scss

@@ -19,6 +19,13 @@
 @import "./markdown";
 @import "src/app/components/all";
 
+<<<<<<< HEAD
+=======
+[type='text'], [type='password'], [type='date'], [type='datetime'], [type='datetime-local'], [type='month'], [type='week'], [type='email'], [type='number'], [type='search'], [type='tel'], [type='time'], [type='url'], [type='color'], textarea {
+  box-shadow: none;
+}
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 /* Small only */
 @media screen and (max-width: 39.9375em) {
   body {

src/app/client_config.js

@@ -1,4 +1,5 @@
 // sometimes it's impossible to use html tags to style coin name, hence usage of _UPPERCASE modifier
+<<<<<<< HEAD
 export const APP_NAME = 'Steemit';
 // sometimes APP_NAME is written in non-latin characters, but they are needed for technical purposes
 // ie. "Голос" > "Golos"
@@ -9,6 +10,18 @@ export const APP_ICON = 'steem';
 // vars. client should read $STM_Config, server should read config package.
 export const APP_URL = 'https://steemit.com';
 export const APP_DOMAIN = 'steemit.com';
+=======
+export const APP_NAME = 'SteemTown';
+// sometimes APP_NAME is written in non-latin characters, but they are needed for technical purposes
+// ie. "Голос" > "Golos"
+export const APP_NAME_LATIN = 'SteemTown';
+export const APP_NAME_UPPERCASE = 'STEEMTOWN';
+export const APP_ICON = 'steem';
+// FIXME figure out best way to do this on both client and server from env
+// vars. client should read $STM_Config, server should read config package.
+export const APP_URL = 'https://steem.town';
+export const APP_DOMAIN = 'steem.town';
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 export const LIQUID_TOKEN = 'Steem';
 // sometimes it's impossible to use html tags to style coin name, hence usage of _UPPERCASE modifier
 export const LIQUID_TOKEN_UPPERCASE = 'STEEM';
@@ -19,7 +32,11 @@ export const DEBT_TOKEN = 'STEEM DOLLAR';
 export const DEBT_TOKENS = 'STEEM DOLLARS';
 export const CURRENCY_SIGN = '$';
 export const WIKI_URL = ''; // https://wiki.golos.io/
+<<<<<<< HEAD
 export const LANDING_PAGE_URL = 'https://steem.io/';
+=======
+export const LANDING_PAGE_URL = 'https://steemapps.com/';
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 export const TERMS_OF_SERVICE_URL = 'https://' + APP_DOMAIN + '/tos.html';
 export const PRIVACY_POLICY_URL = 'https://' + APP_DOMAIN + '/privacy.html';
 export const WHITEPAPER_URL = 'https://steem.io/SteemWhitePaper.pdf';
@@ -36,13 +53,21 @@ export const DEFAULT_CURRENCY = 'USD';
 export const ALLOWED_CURRENCIES = ['USD'];
 
 // meta info
+<<<<<<< HEAD
 export const TWITTER_HANDLE = '@steemit';
+=======
+export const TWITTER_HANDLE = '@steemtown';
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 export const SHARE_IMAGE =
     'https://' + APP_DOMAIN + '/images/steemit-share.png';
 export const TWITTER_SHARE_IMAGE =
     'https://' + APP_DOMAIN + '/images/steemit-twshare.png';
 export const SITE_DESCRIPTION =
+<<<<<<< HEAD
     'Steemit is a social media platform where everyone gets paid for ' +
+=======
+    'SteemTown is a social media platform where everyone gets paid for ' +
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     'creating and curating content. It leverages a robust digital points system, called Steem, that ' +
     'supports real value for digital rewards through market price discovery and liquidity';
 

src/app/components/App.jsx

@@ -109,6 +109,7 @@ class App extends React.Component {
                     </div>
                 </div>
             );
+<<<<<<< HEAD
         } else if (false && ip && this.state.showCallout) {
             callout = (
                 <div className="App__announcement row">
@@ -137,6 +138,8 @@ class App extends React.Component {
                     </div>
                 </div>
             );
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         }
         if ($STM_Config.read_only_mode && this.state.showCallout) {
             callout = (

src/app/components/App.scss

@@ -58,7 +58,11 @@
   background-color: $color-blue-black;
   color: $color-white;
   position: relative;
+<<<<<<< HEAD
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.05);
+=======
+  // box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.05);
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
   h2 {
     font-weight: bold;

src/app/components/cards/PostSummary.scss

@@ -23,7 +23,11 @@ ul.PostsList__summaries > li {
   &:hover {
     @include MQ(L) {
       @include themify($themes) {
+<<<<<<< HEAD
         box-shadow: 2px 2px 3px 0 themed('contentBorderAccent');
+=======
+        // box-shadow: 2px 2px 3px 0 themed('contentBorderAccent');
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
       }
     }
   }