root
/
teverse
mirror of https://github.com/teverse/teverse
1
0
Fork 0
Code Releases Activity

Compare commits

..

No commits in common. "9d2cca67ebeade7b7860959148142e9b9a85e0ca" and "28ed81c357bbb084cd60eca7f73349d14a0b3a20" have entirely different histories.
9d2cca67eb ... 28ed81c357

5 changed files with 138 additions and 217 deletions

19
core/dashboard/pages/apps.lua
View File

@ -3,23 +3,6 @@ return {
iconId = "shapes", iconId = "shapes",
iconType = "faSolid", iconType = "faSolid",
setup = function(page) setup = function(page)
teverse.construct("guiTextBox", {
parent = page,
size = guiCoord(1.0, -20, 0, 48),
position = guiCoord(0, 10, 0, 10),
backgroundAlpha = 0,
text = "Apps",
textSize = 48,
textAlign = "middleLeft"
})
teverse.construct("guiTextBox", {
parent = page,
size = guiCoord(1.0, -20, 0, 18),
position = guiCoord(0, 10, 0, 58),
backgroundAlpha = 0,
text = "Coming soon in a minor update!",
textSize = 18,
textAlign = "middleLeft"
})
end end
} }

60
core/dashboard/pages/develop.lua
View File

@ -3,66 +3,6 @@ return {
iconId = "layer-group", iconId = "layer-group",
iconType = "faSolid", iconType = "faSolid",
setup = function(page) setup = function(page)
teverse.construct("guiTextBox", {
parent = page,
size = guiCoord(1.0, -20, 0, 48),
position = guiCoord(0, 10, 0, 10),
backgroundAlpha = 0,
text = "Develop",
textSize = 48,
textAlign = "middleLeft"
})
local newSandboxBtn = teverse.construct("guiFrame", {
parent = page,
size = guiCoord(1/3, -20, 0, 70),
position = guiCoord(0, 10, 0, 60),
backgroundColour = colour.rgb(74, 140, 122),
strokeRadius = 3
})
teverse.guiHelper
.bind(newSandboxBtn, "xs", {
size = guiCoord(1, -20, 0, 70),
position = guiCoord(0, 10, 0, 60)
})
.bind(newSandboxBtn, "sm", {
size = guiCoord(1/3, -20, 0, 70),
position = guiCoord(0, 10, 0, 60)
})
.bind(newSandboxBtn, "lg", {
size = guiCoord(1/3, -20, 0, 70),
position = guiCoord(0, 10, 0, 60)
})
.hoverColour(newSandboxBtn, colour.rgb(235, 187, 83))
newSandboxBtn:on("mouseLeftUp", function()
teverse.apps:prompt()
end)
teverse.construct("guiTextBox", {
parent = newSandboxBtn,
size = guiCoord(0.5, -10, 0, 18),
position = guiCoord(0.5, 0, 0.5, -9),
backgroundAlpha = 0,
text = "Run Script",
textSize = 18,
textAlign = "middleLeft",
textColour = colour(1, 1, 1),
active = false
--textFont = "tevurl:fonts/openSansLight.ttf"
})
teverse.construct("guiIcon", {
parent = newSandboxBtn,
size = guiCoord(0, 40, 0, 40),
position = guiCoord(0.5, -60, 0.5, -20),
iconMax = 40,
iconColour = colour(1, 1, 1),
iconType = "faSolid",
iconId = "code",
iconAlpha = 0.9,
active = false
})
end end
} }

14
core/dashboard/pages/home.lua
View File

@ -61,8 +61,6 @@ return {
iconId = "sliders-h", iconId = "sliders-h",
iconType = "faSolid", iconType = "faSolid",
setup = function(page) setup = function(page)
page.backgroundAlpha = 1.0
local feed = teverse.construct("guiScrollView", { local feed = teverse.construct("guiScrollView", {
parent = page, parent = page,
size = guiCoord(1, 0, 1, 50), size = guiCoord(1, 0, 1, 50),
@ -71,7 +69,7 @@ return {
strokeRadius = 3 strokeRadius = 3
}) })
teverse.guiHelper teverse.bp
.bind(feed, "xs", { .bind(feed, "xs", {
size = guiCoord(1, 0, 1, 50), size = guiCoord(1, 0, 1, 50),
position = guiCoord(0, 0, 0, -50) position = guiCoord(0, 0, 0, -50)
@ -89,7 +87,7 @@ return {
strokeRadius = 3 strokeRadius = 3
}) })
teverse.guiHelper teverse.bp
.bind(tevs, "xs", { .bind(tevs, "xs", {
size = guiCoord(1, -20, 0, 70), size = guiCoord(1, -20, 0, 70),
position = guiCoord(0, 10, 0, 50) position = guiCoord(0, 10, 0, 50)
@ -146,7 +144,7 @@ return {
strokeRadius = 3 strokeRadius = 3
}) })
teverse.guiHelper teverse.bp
.bind(membership, "xs", { .bind(membership, "xs", {
size = guiCoord(1, -20, 0, 70), size = guiCoord(1, -20, 0, 70),
position = guiCoord(0, 10, 0, 80 + 50) position = guiCoord(0, 10, 0, 80 + 50)
@ -211,7 +209,7 @@ return {
strokeRadius = 3 strokeRadius = 3
}) })
teverse.guiHelper teverse.bp
.bind(version, "xs", { .bind(version, "xs", {
size = guiCoord(1, -20, 0, 70), size = guiCoord(1, -20, 0, 70),
position = guiCoord(0, 10, 0, 160 + 50) position = guiCoord(0, 10, 0, 160 + 50)
@ -274,7 +272,7 @@ return {
clip = true clip = true
}) })
teverse.guiHelper teverse.bp
.bind(feedItems, "xs", { .bind(feedItems, "xs", {
size = guiCoord(1, -20, 1, -(240 + 50)), size = guiCoord(1, -20, 1, -(240 + 50)),
position = guiCoord(0, 10, 0, 240 + 50) position = guiCoord(0, 10, 0, 240 + 50)
@ -311,7 +309,6 @@ return {
local json = teverse.json:decode(body) local json = teverse.json:decode(body)
if json[1].id == newestFeed then if json[1].id == newestFeed then
-- no change from last refresh -- no change from last refresh
return nil
else else
-- may require refactoring -- may require refactoring
for _,v in pairs(feedItems.children) do for _,v in pairs(feedItems.children) do
@ -320,7 +317,6 @@ return {
end end
end end
end end
newestFeed = json[1].id
local y = 50 local y = 50
for _,v in pairs(json) do for _,v in pairs(json) do
local date = os.date("%d/%m/%Y %H:%M", os.parseISO8601(v.postedAt)) local date = os.date("%d/%m/%Y %H:%M", os.parseISO8601(v.postedAt))

6
core/dashboard/ui.lua
View File

@ -13,7 +13,7 @@ controller.setup = function()
backgroundAlpha = 0 backgroundAlpha = 0
}) })
teverse.guiHelper teverse.bp
.gridConstraint(navContainer, { .gridConstraint(navContainer, {
cellSize = guiCoord(0, 40, 0, 40), cellSize = guiCoord(0, 40, 0, 40),
cellMargin = guiCoord(0, 25, 0, 25) cellMargin = guiCoord(0, 25, 0, 25)
@ -68,7 +68,7 @@ controller.setup = function()
backgroundColour = colour.rgb(242, 244, 245) backgroundColour = colour.rgb(242, 244, 245)
}) })
teverse.guiHelper teverse.bp
.bind(body, "xs", { .bind(body, "xs", {
size = guiCoord(1, 90, 1, -5), size = guiCoord(1, 90, 1, -5),
position = guiCoord(0, -45, 0, -60) position = guiCoord(0, -45, 0, -60)
@ -90,7 +90,7 @@ controller.setup = function()
visible = false visible = false
}) })
teverse.guiHelper teverse.bp
.bind(container, "xs", { .bind(container, "xs", {
size = guiCoord(1, -120, 1, -80), size = guiCoord(1, -120, 1, -80),
position = guiCoord(0, 60, 0, 80) position = guiCoord(0, 60, 0, 80)

72
core/tests/gui.lua
View File

@ -1,7 +1,8 @@
return function()
-- Textbox colour/border radius/shadow demo -- Textbox colour/border radius/shadow demo
local colours = { local colours = {
colour(1, 0, 0), colour(1, 0, 0),
colour(1, 1, 0), colour(1, 1, 0),
colour(0, 1, 0), colour(0, 1, 0),
@ -10,11 +11,11 @@ local colours = {
colour(1, 0, 1), colour(1, 0, 1),
colour(1, 1, 1), colour(1, 1, 1),
colour(0, 0, 0) colour(0, 0, 0)
} }
local size = 1/#colours local size = 1/#colours
local lastColour = colour(0,0,0) local lastColour = colour(0,0,0)
for i = 1, #colours do for i = 1, #colours do
teverse.construct("guiTextBox", { teverse.construct("guiTextBox", {
parent = teverse.interface, parent = teverse.interface,
size = guiCoord(size, 0, 0, 50), size = guiCoord(size, 0, 0, 50),
@ -37,21 +38,21 @@ for i = 1, #colours do
}) })
lastColour = c lastColour = c
end end
-- Textbox Align Demo -- Textbox Align Demo
local reverseAlign = {} local reverseAlign = {}
for k,v in pairs(enums.align) do for k,v in pairs(enums.align) do
reverseAlign[tonumber(v)] = k reverseAlign[v] = k
end end
local txtGuis = {} local txtGuis = {}
local size = 1/3 local size = 1/3
local i = 0 local i = 0
local y = 90 local y = 90
for a = 0, 8 do for a = 0, 8 do
i = i + 1 i = i + 1
local gui = teverse.construct("guiTextBox", { local gui = teverse.construct("guiTextBox", {
parent = teverse.interface, parent = teverse.interface,
@ -68,9 +69,9 @@ for a = 0, 8 do
i = 0 i = 0
y = y + 29 y = y + 29
end end
end end
for i = 1, #colours do for i = 1, #colours do
teverse.construct("guiImage", { teverse.construct("guiImage", {
position = guiCoord(0, (i-1) * 75, 0, y), position = guiCoord(0, (i-1) * 75, 0, y),
size = guiCoord(0, 75, 0, 50), size = guiCoord(0, 75, 0, 50),
@ -80,12 +81,12 @@ for i = 1, #colours do
imageBottomRight = vector2(3, 2), imageBottomRight = vector2(3, 2),
imageColour = colours[i] imageColour = colours[i]
}) })
end end
local size = 1/#colours local size = 1/#colours
y = y + 60 y = y + 60
local previous = 0 local previous = 0
for i = 1, #colours do for i = 1, #colours do
local new = math.random(1, 50) local new = math.random(1, 50)
local a = teverse.construct("guiLine", { local a = teverse.construct("guiLine", {
pointA = guiCoord(size*(i-1), 0, 0, y + previous), pointA = guiCoord(size*(i-1), 0, 0, y + previous),
@ -97,9 +98,9 @@ for i = 1, #colours do
lineCap = enums.lineCap.round lineCap = enums.lineCap.round
}) })
previous = new previous = new
end end
for i = 1, #colours do for i = 1, #colours do
local new = math.random(1, 50) local new = math.random(1, 50)
local a = teverse.construct("guiLineBezier", { local a = teverse.construct("guiLineBezier", {
pointA = guiCoord(0, 0, 0, y + (i * 10)), pointA = guiCoord(0, 0, 0, y + (i * 10)),
@ -112,29 +113,30 @@ for i = 1, #colours do
lineCap = enums.lineCap.round lineCap = enums.lineCap.round
}) })
previous = new previous = new
end end
y = y + 60 y = y + 60
-- create an arrow using lines: -- create an arrow using lines:
local arrow = teverse.construct("guiLine", { local arrow = teverse.construct("guiLine", {
pointA = guiCoord(0, 100, 0, y ), pointA = guiCoord(0, 100, 0, y ),
pointB = guiCoord(0, 100, 0, y + 50), pointB = guiCoord(0, 100, 0, y + 50),
parent = teverse.interface, parent = teverse.interface,
lineWidth = 2, lineWidth = 2,
-- rotation = 0.4 -- rotation = 0.4
}) })
teverse.construct("guiLine", { teverse.construct("guiLine", {
parent = arrow, parent = arrow,
pointA = guiCoord(0, 0, 0, 0 ), pointA = guiCoord(0, 0, 0, 0 ),
pointB = guiCoord(0, 10, 0, -10), pointB = guiCoord(0, 10, 0, -10),
lineWidth = 2 lineWidth = 2
}) })
teverse.construct("guiLine", { teverse.construct("guiLine", {
parent = arrow, parent = arrow,
pointA = guiCoord(0, 0, 0, 0 ), pointA = guiCoord(0, 0, 0, 0 ),
pointB = guiCoord(0, -10, 0, -10), pointB = guiCoord(0, -10, 0, -10),
lineWidth = 2 lineWidth = 2
}) })
end