goldsync 0.1.15 → 0.1.16

package/assets/GoldSync.rbxmx

@@ -22,7 +22,7 @@ local CLIENT_HEADERS = {
 }
 local SETTINGS_PREFIX = "GoldSync:v2:"
 local UI_SETTINGS_PREFIX = "GoldSync:ui:v1:"
-local VERSION = "0.1.15"
+local VERSION = "0.1.16"
 local REQUEST_INTERVAL_SECONDS = 0.15
 local REQUEST_RETRY_DELAYS = { 1, 2, 4 }
 
@@ -185,13 +185,13 @@ local searchBox = Instance.new("TextBox")
 searchBox.BackgroundColor3 = Color3.fromRGB(40, 40, 46)
 searchBox.BorderSizePixel = 0
 searchBox.ClearTextOnFocus = false
-searchBox.Font = Enum.Font.BuilderSans
-searchBox.PlaceholderColor3 = Color3.fromRGB(130, 130, 140)
+searchBox.FontFace = Font.new("rbxasset://fonts/families/BuilderSans.json", Enum.FontWeight.Medium)
+searchBox.PlaceholderColor3 = Color3.fromRGB(195, 195, 205)
 searchBox.PlaceholderText = "Search files and instances..."
 searchBox.Size = UDim2.new(1, -132, 1, 0)
 searchBox.Text = ""
 searchBox.TextColor3 = Color3.fromRGB(235, 235, 240)
-searchBox.TextSize = 12
+searchBox.TextSize = 13
 searchBox.TextXAlignment = Enum.TextXAlignment.Left
 searchBox.Parent = controls
 Instance.new("UICorner", searchBox).CornerRadius = UDim.new(0, 4)
@@ -202,12 +202,12 @@ searchPadding.PaddingRight = UDim.new(0, 8)
 local unsyncedButton = Instance.new("TextButton")
 unsyncedButton.BackgroundColor3 = Color3.fromRGB(40, 40, 46)
 unsyncedButton.BorderSizePixel = 0
-unsyncedButton.Font = Enum.Font.BuilderSansBold
+unsyncedButton.FontFace = Font.new("rbxasset://fonts/families/BuilderSans.json", Enum.FontWeight.Medium)
 unsyncedButton.Position = UDim2.new(1, -126, 0, 0)
 unsyncedButton.Size = UDim2.fromOffset(92, 28)
 unsyncedButton.Text = "Unsynced · 0"
 unsyncedButton.TextColor3 = Color3.fromRGB(190, 190, 198)
-unsyncedButton.TextSize = 11
+unsyncedButton.TextSize = 13
 unsyncedButton.Parent = controls
 Instance.new("UICorner", unsyncedButton).CornerRadius = UDim.new(0, 4)
 
@@ -292,12 +292,12 @@ local statusBanner = Instance.new("TextLabel")
 statusBanner.AutomaticSize = Enum.AutomaticSize.Y
 statusBanner.BackgroundColor3 = Color3.fromRGB(66, 38, 40)
 statusBanner.BorderSizePixel = 0
-statusBanner.Font = Enum.Font.BuilderSans
+statusBanner.FontFace = Font.new("rbxasset://fonts/families/BuilderSans.json", Enum.FontWeight.Medium)
 statusBanner.LayoutOrder = 4
 statusBanner.Size = UDim2.new(1, 0, 0, 0)
 statusBanner.Text = ""
 statusBanner.TextColor3 = Color3.fromRGB(255, 205, 205)
-statusBanner.TextSize = 11
+statusBanner.TextSize = 14
 statusBanner.TextWrapped = true
 statusBanner.TextXAlignment = Enum.TextXAlignment.Left
 statusBanner.Visible = false
@@ -309,13 +309,66 @@ statusBannerPadding.PaddingLeft = UDim.new(0, 8)
 statusBannerPadding.PaddingRight = UDim.new(0, 8)
 statusBannerPadding.PaddingTop = UDim.new(0, 7)
 
+local attentionBox = Instance.new("Frame")
+attentionBox.Name = "AttentionBox"
+attentionBox.AutomaticSize = Enum.AutomaticSize.Y
+attentionBox.BackgroundColor3 = Color3.fromRGB(43, 42, 38)
+attentionBox.BorderSizePixel = 0
+attentionBox.LayoutOrder = 5
+attentionBox.Size = UDim2.fromScale(1, 0)
+attentionBox.Visible = false
+attentionBox.Parent = content
+Instance.new("UICorner", attentionBox).CornerRadius = UDim.new(0.04, 0)
+local attentionBoxLayout = Instance.new("UIListLayout")
+attentionBoxLayout.SortOrder = Enum.SortOrder.LayoutOrder
+attentionBoxLayout.Parent = attentionBox
+
+local attentionActions = Instance.new("Frame")
+attentionActions.BackgroundTransparency = 1
+attentionActions.LayoutOrder = 1
+attentionActions.Size = UDim2.new(1, 0, 0, 30)
+attentionActions.Parent = attentionBox
+local attentionBulkButtons = {}
+for index, text in { "Push All →", "← Pull All" } do
+	local button = Instance.new("ImageButton")
+	button.AnchorPoint = Vector2.new(0.5, 0.5)
+	button.BackgroundColor3 = Color3.fromRGB(57, 57, 67)
+	button.BorderSizePixel = 0
+	button.Position = UDim2.fromScale(0.25 + (index - 1) * 0.5, 0.5)
+	button.Size = UDim2.fromScale(0.47, 0.8)
+	button.Parent = attentionActions
+	Instance.new("UICorner", button).CornerRadius = UDim.new(0.22, 0)
+	local label = Instance.new("TextLabel")
+	label.BackgroundTransparency = 1
+	label.Position = UDim2.fromScale(0.12, 0.18)
+	label.Size = UDim2.fromScale(0.76, 0.64)
+	label.Font = Enum.Font.BuilderSansBold
+	label.Text = text
+	label.TextColor3 = Color3.fromRGB(215, 225, 240)
+	label.TextScaled = true
+	label.Parent = button
+	attentionBulkButtons[index] = button
+end
+
+local attentionList = Instance.new("Frame")
+attentionList.Name = "AttentionList"
+attentionList.AutomaticSize = Enum.AutomaticSize.Y
+attentionList.BackgroundTransparency = 1
+attentionList.LayoutOrder = 5
+attentionList.Size = UDim2.fromScale(1, 0)
+attentionList.Visible = false
+attentionList.Parent = attentionBox
+local attentionLayout = Instance.new("UIListLayout")
+attentionLayout.SortOrder = Enum.SortOrder.LayoutOrder
+attentionLayout.Parent = attentionList
+
 local directionLegend = Instance.new("TextLabel")
 directionLegend.BackgroundTransparency = 1
-directionLegend.Font = Enum.Font.BuilderSans
-directionLegend.LayoutOrder = 5
+directionLegend.FontFace = Font.new("rbxasset://fonts/families/BuilderSans.json", Enum.FontWeight.Medium)
+directionLegend.LayoutOrder = 6
 directionLegend.Size = UDim2.new(1, 0, 0, 18)
 directionLegend.Text = "→  Studio to file      ←  File to Studio"
-directionLegend.TextColor3 = Color3.fromRGB(145, 145, 155)
+directionLegend.TextColor3 = Color3.fromRGB(195, 195, 205)
 directionLegend.TextSize = 11
 directionLegend.TextXAlignment = Enum.TextXAlignment.Right
 directionLegend.Parent = content
@@ -323,7 +376,7 @@ directionLegend.Parent = content
 local rootsContainer = Instance.new("Frame")
 rootsContainer.AutomaticSize = Enum.AutomaticSize.Y
 rootsContainer.BackgroundTransparency = 1
-rootsContainer.LayoutOrder = 6
+rootsContainer.LayoutOrder = 7
 rootsContainer.Size = UDim2.new(1, 0, 0, 0)
 rootsContainer.Parent = content
 
@@ -354,6 +407,34 @@ local resolveGitConflict
 local applyTreeFilter
 local resetInstanceTrees
 
+for index, button in attentionBulkButtons do
+	button.Activated:Connect(function()
+		if bulkRunning or not serverConfig or not serverConfig.rojoConnected then
+			return
+		end
+		local affected = {}
+		for _, state in states do
+			if state.statusKind == "issue" and not state.manifest.gitConflict then
+				table.insert(affected, state)
+			end
+		end
+		bulkRunning = true
+		refreshStatusSummary()
+		for _, state in affected do
+			if states[state.manifest.id] ~= state or state.manifest.gitConflict then
+				continue
+			end
+			if index == 1 then
+				upload(state, true)
+			else
+				pull(state)
+			end
+		end
+		bulkRunning = false
+		refreshStatusSummary()
+	end)
+end
+
 local function collectSplitPaths(root, depth)
 	local paths = {}
 	local function visit(instance, remainingDepth, relativePath)
@@ -1753,6 +1834,7 @@ updateGroupSummaries = function()
 		local total = 0
 		local synced = 0
 		local issues = 0
+		local issueColor = Color3.fromRGB(244, 194, 92)
 		local pending = 0
 		local paused = 0
 		for _, state in states do
@@ -1762,6 +1844,9 @@ updateGroupSummaries = function()
 					synced += 1
 				elseif state.statusKind == "issue" then
 					issues += 1
+					if state.status.TextColor3 == Color3.fromRGB(245, 106, 106) then
+						issueColor = state.status.TextColor3
+					end
 				elseif state.statusKind == "paused" then
 					paused += 1
 				else
@@ -1784,7 +1869,7 @@ updateGroupSummaries = function()
 			group.bulkPush.Visible = true
 			group.bulkPull.Visible = true
 			group.statusDot.TextColor3 = if issues > 0
-				then Color3.fromRGB(245, 106, 106)
+				then issueColor
 				elseif synced == total then Color3.fromRGB(102, 214, 139)
 				elseif pending > 0 or paused > 0 then Color3.fromRGB(244, 194, 92)
 				else Color3.fromRGB(180, 180, 190)
@@ -1820,7 +1905,7 @@ refreshUnsyncedButton = function()
 		then Color3.fromRGB(40, 40, 46)
 		else Color3.fromRGB(78, 66, 38)
 	unsyncedButton.TextColor3 = if showSynced
-		then Color3.fromRGB(190, 190, 198)
+		then Color3.fromRGB(220, 220, 230)
 		else Color3.fromRGB(255, 218, 126)
 end
 
@@ -1831,13 +1916,29 @@ refreshStatusSummary = function()
 		local entry = {
 			path = table.concat(state.manifest.studioPath, "."),
 			status = state.status.Text,
+			state = state,
 		}
 		if state.statusKind == "issue" then
 			table.insert(issues, entry)
-		elseif state.statusKind == "working" then
-			table.insert(working, entry)
+		else
+			if state.row.Parent == attentionList then
+				state.row.Parent = state.group.list
+				state.connector.Visible = true
+				state.row.LayoutOrder = state.treeOrder
+				state.title.Text = state.manifest.studioPath[#state.manifest.studioPath]
+				setRootExpanded(state, state.expandedBeforeAttention)
+			end
+			if state.statusKind == "working" then
+				table.insert(working, entry)
+			end
 		end
 	end
+	attentionList.Visible = #issues > 0
+	attentionBox.Visible = #issues > 0
+	for _, button in attentionBulkButtons do
+		button.Active = serverConfig.rojoConnected and not bulkRunning
+		button.AutoButtonColor = button.Active
+	end
 	local entries = if #issues > 0 then issues else working
 	if #entries == 0 then
 		statusBanner.Visible = false
@@ -1851,19 +1952,25 @@ refreshStatusSummary = function()
 			then string.format("%d need attention", #issues)
 			else string.format("%d still syncing", #working),
 	}
-	for index = 1, math.min(#entries, 3) do
-		local entry = entries[index]
-		table.insert(lines, entry.path .. " — " .. entry.status)
-	end
-	if #entries > 3 then
-		table.insert(lines, string.format("+%d more", #entries - 3))
+	for index, entry in entries do
+		if #issues > 0 then
+			local state = entry.state
+			if state.row.Parent ~= attentionList then
+				state.expandedBeforeAttention = state.expanded
+				state.row.Parent = attentionList
+				state.connector.Visible = false
+				setRootExpanded(state, false)
+			end
+			state.row.LayoutOrder = index
+			state.title.Text = entry.path
+		else
+			table.insert(lines, entry.path .. " — " .. entry.status)
+		end
 	end
 	statusBanner.BackgroundColor3 = if #issues > 0
-		then Color3.fromRGB(66, 38, 40)
-		else Color3.fromRGB(66, 56, 34)
-	statusBanner.TextColor3 = if #issues > 0
-		then Color3.fromRGB(255, 205, 205)
-		else Color3.fromRGB(255, 224, 145)
+		then Color3.fromRGB(49, 46, 38)
+		else Color3.fromRGB(43, 42, 38)
+	statusBanner.TextColor3 = Color3.fromRGB(230, 222, 200)
 	statusBanner.Text = table.concat(lines, "\n")
 	statusBanner.Visible = true
 end
@@ -2272,6 +2379,8 @@ local function createRootRow(manifest, order)
 		manifest = manifest,
 		group = group,
 		row = row,
+		treeOrder = order,
+		connector = connector,
 		title = title,
 		icon = icon,
 		iconClass = if rootInstance then rootInstance.ClassName else "Model",
@@ -2582,6 +2691,7 @@ refreshConfig = function()
 		for _, state in states do
 			disconnectRoot(state)
 			destroyConflictWorkspace(state)
+			state.row:Destroy()
 		end
 		disconnectSplitRoots()
 		table.clear(states)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goldsync",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "Automatic native Roblox asset synchronization for Rojo projects.",
   "author": "tay",
   "license": "SEE LICENSE IN LICENSE.txt",