ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 02:08:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13 from ClaytonWWilson/profile_display

Browse Source 
change the location of logo.png so that it displays correctly
This commit is contained in:
Leon Liang 2019-09-27 22:04:16 -04:00 committed by GitHub
commit 6cb3441ad7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
twistter-frontend/package-lock.json generated
View File

@ -428,6 +428,38 @@
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
},
"axios": {
"version": "0.19.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
"integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
"requires": {
"follow-redirects": "1.5.10",
"is-buffer": "^2.0.2"
},
"dependencies": {
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"requires": {
"ms": "2.0.0"
}
},
"follow-redirects": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
"requires": {
"debug": "=3.1.0"
}
},
"is-buffer": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
"integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
}
}
},
"babel-code-frame": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",

1
twistter-frontend/package.json
View File

@ -4,6 +4,7 @@
"private": true,
"dependencies": {
"@material-ui/core": "^4.4.3",
"axios": "^0.19.0",
"create-react-app": "^3.1.2",
"install": "^0.13.0",
"node-pre-gyp": "^0.13.0",

1
twistter-frontend/src/App.js
View File

@ -10,6 +10,7 @@ import Route from 'react-router-dom/Route';
import home from './Home.js';
import register from './Register.js';
import login from './Login.js';
import user from './pages/user';
class App extends Component {
render() {

2
twistter-frontend/src/Home.js
View File

@ -1,7 +1,7 @@
import React, { Component } from 'react';
import './App.css';
import logo from './twistter-logo.png';
import logo from './images/twistter-logo.png';
class Home extends Component {

3
twistter-frontend/src/Login.js
View File

@ -1,7 +1,8 @@
/* eslint-disable */
import React, { Component } from 'react';
import './App.css';
import logo from './twistter-logo.png';
import logo from './images/twistter-logo.png';
import TextField from '@material-ui/core/TextField';
import axios from 'axios';

2
twistter-frontend/src/Register.js
View File

@ -1,7 +1,7 @@
import React, { Component } from 'react';
import './App.css';
import logo from './twistter-logo.png';
import logo from './images/twistter-logo.png';
import TextField from '@material-ui/core/TextField';
//import axios from 'axios';