fix setting deploy autoload

mihalskiy · Dec 10, 2018 · ec1c2ab · ec1c2ab
1 parent c12b6ea
commit ec1c2ab
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 13,789 deletions.
diff --git a/.eslintrc → client/.eslintrc b/.eslintrc → client/.eslintrc
diff --git a/client/package.json b/client/package.json
@@ -1,9 +1,9 @@
 {
   "name": "portfolio-2018",
   "version": "0.1.0",
-  "homepage": "http://www.nurmaget.com",
+  "homepage": "http://nurmaget.com",
   "private": true,
-  "proxy": "http://www.nurmaget.com",
+  "proxy": "http://nurmaget.com:8000",
   "devDependencies": {
     "babel-eslint": "^7.2.3",
     "eslint": "^4.1.1",
@@ -38,7 +38,7 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "PUBLIC_URL=http://www.nurmaget.com react-scripts build",
+    "build": "PUBLIC_URL=http://nurmaget.com react-scripts build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   }

diff --git a/client/src/app/App.js b/client/src/app/App.js
@@ -130,10 +130,10 @@ class App extends Component {
                                                                                 </Helmet>
                                                                                 <Switch location={location}>
                                                                                     <Route exact path="/" render={props => <Home {...props} status={status} />} />
-                                                                                    <Route path="/projects/contact" render={props => <Contact {...props} status={status} />} />
-                                                                                    <Route path="/projects/price" render={props => <ProjectSPR {...props} status={status} />} />
-                                                                                    <Route path="/projects/portfolio" render={props => <ProjectPortfolio {...props} status={status} />} />
-                                                                                    <Route path="/projects/slice" render={props => <ProjectSlice {...props} status={status} />} />
+                                                                                    <Route path="/contact" render={props => <Contact {...props} status={status} />} />
+                                                                                    <Route path="/price" render={props => <ProjectSPR {...props} status={status} />} />
+                                                                                    <Route path="/portfolio" render={props => <ProjectPortfolio {...props} status={status} />} />
+                                                                                    <Route path="/slice" render={props => <ProjectSlice {...props} status={status} />} />
                                                                                     <Route render={props => <NotFound {...props} status={status} />} />
                                                                                 </Switch>
                                                                             </MainContent>

diff --git a/client/src/screens/Home.js b/client/src/screens/Home.js
@@ -171,7 +171,7 @@ export default class Home extends Component {
           title="ПРИМЕРЫ НАШИХ РАБОТ"
           description="За время своей работы мы разработали более 600 лендингов работающих во всех странах мира и генерирующих своим заказчикам тысячи обращений в сутки. Большинство клиентов заказали у нас по несколько лендингов на каждое направление своего бизнеса"
           buttonText="Посмотреть все роботы"
-          buttonTo="/projects/portfolio"
+          buttonTo="/portfolio"
           imageSrc={[`${sprProject} 980w, ${sprProjectLarge} 1376w`]}
           imageAlt={['Smart Sparrow lesson builder']}
           imagePlaceholder={[sprProjectPlaceholder]}
@@ -185,7 +185,7 @@ export default class Home extends Component {
           title="СКОЛЬКО СТОИТ?"
           description="Наши цены вас приятно удивят, оплата поэтапная любым удобным способом"
           buttonText="Посмотреть росценки"
-          buttonLink="/projects/price"
+          buttonLink="/price"
           imageSrc={[
             `${gamestackLogin} 254w, ${gamestackLoginLarge} 508w`,
             `${gamestackList} 254w, ${gamestackListLarge} 508w`,
@@ -208,7 +208,7 @@ export default class Home extends Component {
           title="Блог"
           description="Выбор технологий для большого и не очень большого веб-проекта"
           buttonText="Перейти к блогу"
-          buttonTo="/projects/slice"
+          buttonTo="/slice"
           imageSrc={[`${sliceProject} 980w, ${sliceProjectLarge} 1376w`]}
           imageAlt={['Annotating a biomedical image in the Slice app']}
           imagePlaceholder={[sliceProjectPlaceholder]}

diff --git a/client/src/screens/ProjectPortfolio.js b/client/src/screens/ProjectPortfolio.js
@@ -74,7 +74,7 @@ let ProjectPortfolio = ({ status, table = {} }) => (
             <NavPortfolio
                 title={title}
                 description={description}
-                url="/projects/contact"
+                url="/contact"
                 src={backgroundSprPlaceholder}
             />
             <ProjectSection>

diff --git a/client/src/screens/ProjectSPR.js b/client/src/screens/ProjectSPR.js
@@ -45,7 +45,7 @@ class ProjectSPR extends Component {
                     <ProjectHeader
                         title={title}
                         description={description}
-                        url="/projects/contact"
+                        url="/contact"
                         roles={roles}
                     />
                     <ProjectSection>

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,15 +4,20 @@ services:
   server:
     build:
       context: ./server/
-    command: npm start &  sequelize db:migrate
+    command: npm start & npm run db:init
     volumes:
       - ./server/:/usr/app
       - /usr/app/node_modules
     ports:
       - "8000:8000"
-    # env_file: ./server/.env # TODO - uncomment this to auto-load your .env file!
     environment:
+      # env_file: ../server/.env # TODO - uncomment this to auto-load your .env file!
       CONNECTION_STRING_DEV: postgres://user:password@db/db
+      MAIL_HOST: ${MAIL_HOST}
+      MAIL_USER: ${MAIL_USER}
+      MAIL_PASS: ${MAIL_PASS}
+      MAIL_SERVICE: ${MAIL_SERVICE}
+      PUBLIC_URL: http://nurmaget.com
     links:
         - db
     depends_on:

diff --git a/init.sql b/init.sql