Skip to content

Commit ad18d7a

Browse files
committed
merge
2 parents b3deb17 + b43f955 commit ad18d7a

8 files changed

Lines changed: 51 additions & 19 deletions

File tree

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12+
"path": "^0.12.7",
1213
"vue": "^3.3.8",
1314
"vue-command": "^35.2.1",
1415
"vue-cookie-law": "github:elasticdotventures/vue-cookie-law",

pysrc/evlib/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ def main():
2222
# base64_ico = base64.b64encode(ico_buffer.getvalue()).decode()
2323

2424
# # Output the base64 encoded favicon
25-
# print(base64_ico)
25+
# print(base64_ico)

src/App.vue

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import CookieBanner from './components/CookieBanner.vue';
55
66
import CommandLineInterface from './components/CommandLineInterface.vue';
77
import PromptExecutionLogo from './components/PromptExecutionLogo.vue';
8-
// import HelloWorld from './components/HelloWorld.vue'
9-
// import HelloWorld from './components/HelloWorld.vue'
108
119
const showBanner = ref(true); // Or whatever logic you need to show/hide the banner
1210
@@ -17,6 +15,7 @@ onMounted(() => {
1715
// For example, check if the user has already accepted cookies
1816
// showBanner.value = ...;
1917
});
18+
import TheFooter from './components/TheFooter.vue';
2019
2120
</script>
2221

@@ -25,7 +24,9 @@ onMounted(() => {
2524
<PromptExecutionLogo />
2625
</div>
2726
<CommandLineInterface />
28-
<CookieBanner v-if="showBanner" />
27+
<TheFooter />
28+
29+
<CookieBanner v-if="showBanner" />
2930
</template>
3031

3132
<style scoped>
@@ -40,5 +41,8 @@ onMounted(() => {
4041
}
4142
/* .logo.vue:hover {
4243
filter: drop-shadow(0 0 2em #42b883aa);
43-
} */
44+
}
45+
*/
46+
47+
4448
</style>

src/components/PromptExecutionLogo.vue

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,4 @@
1010

1111
<style scoped>
1212
13-
@font-face {
14-
font-family: 'PEPatron-PersonalUse-Regular', 'sans-serif';
15-
src: url('@/assets/fonts/Patron-PersonalUse-Regular.otf') format('opentype');
16-
font-weight: normal;
17-
font-style: normal;
18-
}
19-
20-
@font-face {
21-
font-family: 'PEExodarOutline', 'san-serif';
22-
src: url('@/assets/fonts/ExodarOutline.otf') format('opentype');
23-
font-weight: normal;
24-
font-style: normal;
25-
}
26-
2713
</style>

src/components/TheFooter.vue

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<template>
2+
<div class="footy">
3+
☎️: <a href="callto://+(61) 3 4238 2424">+(61) 3 4238 2424</a> &nbsp;&nbsp; 📩: <a href="mailto:hello@promptexecution.com">hello@promptexecution.com</a> &nbsp;&nbsp; 🦘 <a target="_blank" href="https://abr.business.gov.au/ABN/View?id=45650385466">ABN: 456 5038 5466</a>
4+
</div>
5+
</template>
6+
7+
<style scoped>
8+
.footy {
9+
font-family: 'PEPatron-PersonalUse-Regular', 'PEExodarOutline', 'Roboto'; /* sans-serif; */
10+
font-size: 0.8em;
11+
12+
}
13+
.footy a:link {
14+
color: grey;
15+
}
16+
.footy a:hover {
17+
color: #646cff;
18+
}
19+
</style>

src/style.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
2+
@font-face {
3+
font-family: 'PEPatron-PersonalUse-Regular';
4+
src: url('@/assets/fonts/Patron-PersonalUse-Regular.otf') format('opentype');
5+
font-weight: normal;
6+
font-style: normal;
7+
}
8+
9+
@font-face {
10+
font-family: 'PEExodarOutline';
11+
src: url('@/assets/fonts/ExodarOutline.ttf') format('truetype');
12+
color: #242424;
13+
font-weight: normal;
14+
font-style: normal;
15+
}
16+
117
:root {
218
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
319
line-height: 1.5;

vite.config.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import { defineConfig } from 'vite'
22
import vue from '@vitejs/plugin-vue'
3+
import path from 'path';
34

45
// https://vitejs.dev/config/
56
export default defineConfig({
67
plugins: [vue()],
8+
resolve: {
9+
alias: {
10+
'@': path.resolve(__dirname, 'src')
11+
},
12+
}
713
})

0 commit comments

Comments
 (0)