added footer logo, removed eng, added caps
This commit is contained in:
aj
parent
c72a8b114d
commit
7c282947e6
BIN
footer.xcf
Normal file
BIN
footer.xcf
Normal file
Binary file not shown.
1169
package-lock.json
generated
1169
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
18
package.json
18
package.json
@ -19,21 +19,21 @@
|
||||
},
|
||||
"homepage": "https://github.com/Sarsoo/sarsoo.xyz#readme",
|
||||
"devDependencies": {
|
||||
"@babel/cli": "^7.7.5",
|
||||
"@babel/core": "^7.7.5",
|
||||
"@babel/preset-env": "^7.7.6",
|
||||
"@babel/preset-react": "^7.7.4",
|
||||
"@babel/cli": "^7.8.4",
|
||||
"@babel/core": "^7.8.6",
|
||||
"@babel/preset-env": "^7.8.6",
|
||||
"@babel/preset-react": "^7.8.3",
|
||||
"babel-loader": "^8.0.6",
|
||||
"clean-webpack-plugin": "^3.0.0",
|
||||
"css-loader": "^2.1.1",
|
||||
"style-loader": "^0.23.1",
|
||||
"webpack": "^4.41.2",
|
||||
"webpack-cli": "^3.3.10",
|
||||
"webpack": "^4.41.6",
|
||||
"webpack-cli": "^3.3.11",
|
||||
"webpack-merge": "^4.2.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^0.19.0",
|
||||
"react": "^16.12.0",
|
||||
"react-dom": "^16.12.0"
|
||||
"axios": "^0.19.2",
|
||||
"react": "^16.13.0",
|
||||
"react-dom": "^16.13.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,24 +4,24 @@ chardet==3.0.4
|
||||
Click==7.0
|
||||
Flask==1.1.1
|
||||
google-api-core==1.16.0
|
||||
google-auth==1.10.1
|
||||
google-cloud-core==1.2.0
|
||||
google-cloud-firestore==1.6.1
|
||||
google-auth==1.11.2
|
||||
google-cloud-core==1.3.0
|
||||
google-cloud-firestore==1.6.2
|
||||
google-cloud-logging==1.14.0
|
||||
googleapis-common-protos==1.51.0
|
||||
grpcio==1.26.0
|
||||
idna==2.8
|
||||
grpcio==1.27.2
|
||||
idna==2.9
|
||||
itsdangerous==1.1.0
|
||||
Jinja2==2.10.3
|
||||
Jinja2==2.11.1
|
||||
MarkupSafe==1.1.1
|
||||
numpy==1.18.1
|
||||
opencv-python==4.1.2.30
|
||||
protobuf==3.11.2
|
||||
opencv-python==4.2.0.32
|
||||
protobuf==3.11.3
|
||||
pyasn1==0.4.8
|
||||
pyasn1-modules==0.2.8
|
||||
pytz==2019.3
|
||||
requests==2.22.0
|
||||
requests==2.23.0
|
||||
rsa==4.0
|
||||
six==1.14.0
|
||||
urllib3==1.25.7
|
||||
Werkzeug==0.16.0
|
||||
urllib3==1.25.8
|
||||
Werkzeug==1.0.0
|
||||
|
||||
@ -17,7 +17,6 @@ if os.environ.get('DEPLOY_DESTINATION', None) == 'PROD':
|
||||
|
||||
client = google.cloud.logging.Client()
|
||||
handler = CloudLoggingHandler(client, name="sarsooxyz")
|
||||
setup_logging(handler)
|
||||
|
||||
handler.setFormatter(formatter)
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<h1>{{ tag.name }}</h1>
|
||||
<img src="{{ staticroot }}art/{{ tag.splash.file_name }}.jpg" alt="{{ tag.splash.file_name }}">
|
||||
{% if tag.description %}<p>{{ tag.description }}{{ tag.image }}</p>{% endif %}
|
||||
<a href="/{{ urlprefix }}/{{ tag.doc_name }}" style="width:100%;" class="button">view</a>
|
||||
<a href="/{{ urlprefix }}/{{ tag.doc_name }}" style="width:100%;" class="button">View</a>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
{% block content %}
|
||||
<div class="row text-no-select">
|
||||
<h1 class = "col-12" style = "text-align: center; color: white;">most played of the last month</h1>
|
||||
<h1 class = "col-12" style = "text-align: center; color: white;">Last Month</h1>
|
||||
</div>
|
||||
<div class="row text-no-select">
|
||||
{% for album in albums %}
|
||||
|
||||
@ -39,9 +39,4 @@ def main():
|
||||
def dev():
|
||||
return render_template('dev.html')
|
||||
|
||||
|
||||
@app.route('/engineering')
|
||||
def eng():
|
||||
return render_template('eng.html')
|
||||
|
||||
# [END gae_python37_app]
|
||||
|
||||
@ -22,20 +22,24 @@
|
||||
</div>
|
||||
<br><br>
|
||||
<ul class="navbar">
|
||||
<li><a href="/">home</a></li>
|
||||
<li><a href="/dev">dev</a></li>
|
||||
<li><a href="/art">art</a></li>
|
||||
<li><a href="/music">music</a></li>
|
||||
<li><a href="/engineering">engineering</a></li>
|
||||
<li class="right"><a href="https://www.instagram.com/pack_it_in_/">art ig</a></li>
|
||||
<li class="right"><a href="https://www.last.fm/user/sarsoo">last.fm</a></li>
|
||||
<li class="right"><a href="https://github.com/sarsoo">github</a></li>
|
||||
<li class="right"><a href="https://music.sarsoo.xyz">music tools</a></li>
|
||||
<li><a href="/">Home</a></li>
|
||||
<li><a href="/dev">Dev & Engineering</a></li>
|
||||
<li><a href="/art">Art</a></li>
|
||||
<li><a href="/music">Music</a></li>
|
||||
<li class="right"><a href="https://www.instagram.com/pack_it_in_/">Art IG</a></li>
|
||||
<li class="right"><a href="https://www.last.fm/user/sarsoo">Last.fm</a></li>
|
||||
<li class="right"><a href="https://github.com/sarsoo">Github</a></li>
|
||||
<li class="right"><a href="https://music.sarsoo.xyz">Music Tools</a></li>
|
||||
</ul>
|
||||
|
||||
{% block content %}{% endblock %}
|
||||
<footer>
|
||||
<a href="https://github.com/Sarsoo/sarsoo.xyz">view source code</a>
|
||||
</footer>
|
||||
<img src="https://storage.googleapis.com/sarsooxyzstatic/andy.png"
|
||||
alt="AP"
|
||||
width="120px"
|
||||
style="align:center;
|
||||
display: block;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
padding: 8px">
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
{% extends 'base.html' %}
|
||||
|
||||
{% block title %}/engineering{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div id="react"></div>
|
||||
<script src="{{ url_for('static', filename='js/eng.bundle.js') }}"></script>
|
||||
{% endblock %}
|
||||
@ -12,7 +12,7 @@
|
||||
</div>
|
||||
<div class="col-3 profile">
|
||||
<img src="{{ staticroot }}me.jpg" height=150>
|
||||
<p style="text-align: center">sarsoo</p>
|
||||
<p style="text-align: center">Sarsoo</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ class DevGallery extends Component {
|
||||
|
||||
const gallery = <div>{arrays.map((entry) => <Row entries={entry}/>)}</div>;
|
||||
|
||||
const loadingMessage = <p className="center-text text-no-select" >loading...</p>;
|
||||
const loadingMessage = <p className="center-text text-no-select" >Loading...</p>;
|
||||
|
||||
return this.state.isLoading ? loadingMessage : gallery;
|
||||
}
|
||||
@ -64,7 +64,7 @@ function DevEntry(props){
|
||||
|
||||
{props.entry.description.map((entry) => <p key={entry} >{entry}</p>)}
|
||||
|
||||
<a href={props.entry.url} className="button full-width">view source</a>
|
||||
<a href={props.entry.url} className="button full-width">View</a>
|
||||
</div>
|
||||
|
||||
);
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
import React, { Component } from "react";
|
||||
const axios = require('axios');
|
||||
|
||||
class EngineeringGallery extends Component {
|
||||
|
||||
constructor(props){
|
||||
super(props);
|
||||
this.state = {
|
||||
entries: [],
|
||||
isLoading: true
|
||||
};
|
||||
this.getEntries();
|
||||
}
|
||||
|
||||
getEntries(){
|
||||
|
||||
var self = this;
|
||||
axios.get('/api/eng')
|
||||
.then(function (response){
|
||||
self.setState({
|
||||
entries: response.data.eng,
|
||||
isLoading: false
|
||||
});
|
||||
})
|
||||
.catch(function (error){
|
||||
console.log(error);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
render(){
|
||||
|
||||
var arrays = [], size = 3;
|
||||
|
||||
var a = this.state.entries.slice()
|
||||
while (a.length > 0)
|
||||
arrays.push(a.splice(0, size));
|
||||
|
||||
const gallery = <div>{arrays.map((entry) => <Row entries={entry} />)}</div>;
|
||||
|
||||
const loadingMessage = <p className="center-text text-no-select" >loading...</p>;
|
||||
|
||||
return this.state.isLoading ? loadingMessage : gallery;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function Row(props){
|
||||
|
||||
return (
|
||||
<div className="row text-no-select">
|
||||
{props.entries.map((entry) => <WorkEntry entry={entry} key={entry.index} />)}
|
||||
</div>
|
||||
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
function WorkEntry(props){
|
||||
return (
|
||||
|
||||
<div className="pad-4 card">
|
||||
<h1>{props.entry.name}</h1>
|
||||
|
||||
{props.entry.description.map((entry) => <p key={entry} >{entry}</p>)}
|
||||
|
||||
<a href={props.entry.url} className="button full-width">read</a>
|
||||
</div>
|
||||
|
||||
);
|
||||
}
|
||||
|
||||
export default EngineeringGallery;
|
||||
@ -1,6 +0,0 @@
|
||||
import React from "react";
|
||||
import ReactDOM from "react-dom";
|
||||
|
||||
import EngineeringGallery from "./EngineeringGallery.js";
|
||||
|
||||
ReactDOM.render(<EngineeringGallery />, document.getElementById('react'));
|
||||
@ -4,8 +4,7 @@ const { CleanWebpackPlugin } = require('clean-webpack-plugin');
|
||||
|
||||
module.exports = {
|
||||
entry: {
|
||||
dev: './src/js/dev/dev.js',
|
||||
eng: './src/js/eng/eng.js'
|
||||
dev: './src/js/dev/dev.js'
|
||||
},
|
||||
module: {
|
||||
rules: [
|
||||
|
||||
Loading…
Reference in New Issue
Block a user