Toggle navigation
Toggle navigation
This project
Loading...
Sign in
2020-1-capstone-design1
/
Triz_Project1
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
1
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
minsung
2020-06-01 02:50:35 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
da33a5a3a3a4cae2903f3ff0850baf46b6bdc9c9
da33a5a3
1 parent
dc70be39
overwrite
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
11 deletions
back/Dockerfile
back/prisma/Dockerfile
front/src/Components/Message.js
front/src/Routes/Chat/ChatContainer.js
front/web/react-app/public/After_login.html → front/web/Choose-workspace.html
front/web/react-app/public/Sign_in.html → front/web/react-app/public/chatroom.html
front/web/react-app/public/favicon.ico
front/web/react-app/src/mainpage/main.js
back/Dockerfile
View file @
da33a5a
...
...
@@ -9,12 +9,12 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
&&
tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-
$DOCKERIZE_VERSION
.tar.gz
\
&&
rm dockerize-alpine-linux-amd64-
$DOCKERIZE_VERSION
.tar.gz
ENTRYPOINT
[ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "
6
0s" ]
ENTRYPOINT
[ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "
30
0s" ]
COPY package*.json ./
COPY package*.json ./
COPY prisma ./prisma/
RUN
npm install
&&
npx prisma generate
CMD
["npm","start"]
COPY . .
\ No newline at end of file
COPY . .
...
...
back/prisma/Dockerfile
View file @
da33a5a
...
...
@@ -9,8 +9,8 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
&&
tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-
$DOCKERIZE_VERSION
.tar.gz
\
&&
rm dockerize-alpine-linux-amd64-
$DOCKERIZE_VERSION
.tar.gz
ENTRYPOINT
[ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "
6
0s" ]
ENTRYPOINT
[ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "
30
0s" ]
COPY ./ ./prisma/
CMD
["prisma", "studio", "--experimental"]
\ No newline at end of file
CMD
["prisma", "studio", "--experimental"]
...
...
front/src/Components/Message.js
View file @
da33a5a
import
React
from
"react"
;
import
styled
from
"styled-components"
;
import
{
parse
,
format
}
from
"date-fns"
;
//
import { parse, format } from "date-fns";
const
MessageWrapper
=
styled
.
div
`
display: flex;
...
...
front/src/Routes/Chat/ChatContainer.js
View file @
da33a5a
...
...
@@ -9,7 +9,7 @@ import {
}
from
"./ChatQueries"
;
import
useInput
from
"../../Hooks/useInput"
;
import
{
toast
}
from
"react-toastify"
;
import
defaultProfile
from
"../imgs/defaultProfile.jpg"
;
//
import defaultProfile from "../imgs/defaultProfile.jpg";
export
default
withRouter
(({
location
})
=>
{
const
{
pathname
}
=
location
;
...
...
front/web/
react-app/public/After_login
.html
→
front/web/
Choose-workspace
.html
View file @
da33a5a
File moved
front/web/react-app/public/
Sign_in
.html
→
front/web/react-app/public/
chatroom
.html
View file @
da33a5a
File moved
front/web/react-app/public/favicon.ico
deleted
100644 → 0
View file @
dc70be3
No preview for this file type
front/web/react-app/src/mainpage/main.js
View file @
da33a5a
...
...
@@ -22,7 +22,4 @@ class KhuIcon extends Component {
}
}
export
default
{
HelloKhu
,
KhuIcon
}
...
...
Please
register
or
login
to post a comment